Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jun 29, 2025

Why

When node A becomes the leader, it still takes a few exchanges with followers to allow cluster changes again.

Concurrently, the testcase blocks traffic between A and other nodes to simulate a network partition. If this happens after A becomes the leader but before cluster changes are permitted again, the testcase will never succeed and will eventually abort with:

Case: cluster_minority_SUITE:remove_node_when_seed_node_is_leader
Reason: {error,
            {{awaitMatch,
                 [{module,cluster_minority_SUITE},
                  {expression, "..."},
                  {pattern,"ok"},
                  {value,
                      {error,69,<<"Error:\ncluster_change_not_permitted">>}}]},

How

Before blocking traffic, we wait for cluster changes to be permitted again on node A.


This is an automatic backport of pull request #14150 done by Mergify.

…ader`

[Why]
When node A becomes the leader, it still takes a few exchanges with
followers to allow cluster changes again.

Concurrently, the testcase blocks traffic between A and other nodes to
simulate a network partition. If this happens after A becomes the leader
but before cluster changes are permitted again, the testcase will never
succeed and will eventually abort with:

    Case: cluster_minority_SUITE:remove_node_when_seed_node_is_leader
    Reason: {error,
                {{awaitMatch,
                     [{module,cluster_minority_SUITE},
                      {expression, "..."},
                      {pattern,"ok"},
                      {value,
                          {error,69,<<"Error:\ncluster_change_not_permitted">>}}]},

[How]
Before blocking traffic, we wait for cluster changes to be permitted
again on node A.

(cherry picked from commit 7166357)

# Conflicts:
#	deps/rabbit/test/cluster_minority_SUITE.erl
@mergify mergify bot added the conflicts label Jun 29, 2025
@mergify
Copy link
Author

mergify bot commented Jun 29, 2025

Cherry-pick of 7166357 has failed:

On branch mergify/bp/v4.1.x/pr-14150
Your branch is up to date with 'origin/v4.1.x'.

You are currently cherry-picking commit 716635742.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/test/cluster_minority_SUITE.erl

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Jun 29, 2025
@dumbbell
Copy link
Collaborator

In fact, the testcase is quite different compared to main. Let’s abandon this backport.

@dumbbell dumbbell closed this Jun 29, 2025
@dumbbell dumbbell deleted the mergify/bp/v4.1.x/pr-14150 branch June 29, 2025 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants